CB-5197 create main connection fields dynamically #2693

yagudin10 · 2024-06-07T10:11:07Z

No description provided.

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

webapp/packages/core-blocks/src/ObjectPropertyInfo/ObjectPropertyInfoForm/RenderField.tsx

webapp/packages/core-sdk/src/queries/fragments/DatabaseDriver.gql

webapp/packages/core-sdk/src/queries/fragments/DriverMainPropertyInfo.gql

webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts

webapp/packages/plugin-connections/src/ConnectionForm/Options/getDefaultConfigurationType.ts

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts

DenisSinelnikov · 2024-06-13T10:15:23Z

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java

+    @Property
+    public Map<String, String> getMainProperties() {
+        Map<String, String> mainProperties = new LinkedHashMap<>();
+        mainProperties.put(DBConstants.PROP_HOST, dataSourceContainer.getConnectionConfiguration().getHostName());


may be move dataSourceContainer.getConnectionConfiguration() to parameter

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java

alexander-skoblikov · 2024-06-14T09:14:39Z

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

@@ -248,6 +248,10 @@ type DriverInfo {
    # Driver parameters (map name->value)
    driverParameters: Object!

+    # Main driver properties
+    # Contains info about main fields (host, port, database, server name)
+    mainProperties: [ObjectPropertyInfo!]! @since(version: "24.1.1")


mainProperties sounds strange 🤔

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

alexander-skoblikov · 2024-06-14T09:15:23Z

server/bundles/io.cloudbeaver.server/schema/service.core.graphqls

+    databaseName: String @deprecated(reason: "24.1.1, use mainProperties")
+
+    # Host, port, serverName, databaseName are stored and mainProperties
+    mainProperties: Object @since(version: "24.1.1")


…//github.com/dbeaver/cloudbeaver into CB-5197-create-connection-fields-dynamically

sergeyteleshev · 2024-06-18T09:49:53Z

webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts


    const config = contexts.getContext(connectionConfigContext);
    const stateContext = contexts.getContext(formStateContext);
-    const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties']);
+    const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties', 'includeMainProperties']);


may be like this? i dont like when we trick TS like this with "!"

Suggested change

const config = contexts.getContext(connectionConfigContext);

const stateContext = contexts.getContext(formStateContext);

const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties']);

const driver = await this.dbDriverResource.load(data.config.driverId!, ['includeProviderProperties', 'includeMainProperties']);

if (!data.info || !data.config.driverId) {

return;

}

const config = contexts.getContext(connectionConfigContext);

const stateContext = contexts.getContext(formStateContext);

const driver = await this.dbDriverResource.load(data.config.driverId, ['includeProviderProperties', 'includeMainProperties']);

sergeyteleshev · 2024-06-18T09:55:43Z

webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx

 }

 const driverConfiguration: IDriverConfiguration[] = [
  {
    name: 'Manual',
    value: DriverConfigurationType.Manual,
+    isVisible: driver => driver.configurationTypes.includes(DriverConfigurationType.Manual),


should we add here also extra check that some properties are exists like you did in DriverConfigurationType.Custom a little bit below?

sergeyteleshev · 2024-06-18T09:55:49Z

webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx

  },
  {
    name: 'URL',
    value: DriverConfigurationType.Url,
+    isVisible: driver => driver.configurationTypes.includes(DriverConfigurationType.Url),


Wroud · 2024-06-18T10:53:47Z

webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts

+    if (tempConfig.configurationType === DriverConfigurationType.Custom && !!driver.mainProperties?.length) {
+      tempConfig.mainProperties = this.prepareDynamicProperties(driver.mainProperties, tempConfig.mainProperties, tempConfig.configurationType);
    }


i will suggest to use switch(tempConfig.configurationType) to exclude unwanted effects from different types of configuration so you can be sure that you'll sent only state related to selected configuration

for example:
tempConfig.mainProperties = toJS(state.config.mainProperties); always set

it can reflect on:

if (tempConfig.configurationType === DriverConfigurationType.Custom && !!driver.mainProperties?.length) { tempConfig.mainProperties = this.prepareDynamicProperties(driver.mainProperties, tempConfig.mainProperties, tempConfig.configurationType); }

…ction-fields-dynamically

CB-5238 add main properties for connections

52916b6

yagudin10 requested a review from alexander-skoblikov June 7, 2024 10:11

devnaumov and others added 3 commits June 10, 2024 16:16

CB-5197 render main properties

2f2ded9

CB-5197 render main properties

f0ce0c3

CB-5238 set default values to main properties

c7723dc

devnaumov requested review from Wroud and sergeyteleshev June 12, 2024 12:26

devnaumov assigned devnaumov and yagudin10 Jun 12, 2024

devnaumov marked this pull request as ready for review June 12, 2024 12:26

Merge branch 'devel' into CB-5197-create-connection-fields-dynamically

d5b7b0b

Wroud requested changes Jun 13, 2024

View reviewed changes

CB-5197 fix(ci/cd): respect base and target branches

5baa81e

DenisSinelnikov reviewed Jun 13, 2024

View reviewed changes

CB-5238 fixes after review

c6d0a98

alexander-skoblikov reviewed Jun 14, 2024

View reviewed changes

devnaumov added 4 commits June 14, 2024 13:46

CB-5197 review fixes

24f42a7

Merge branch 'CB-5197-create-connection-fields-dynamically' of https:…

48be5fc

…//github.com/dbeaver/cloudbeaver into CB-5197-create-connection-fields-dynamically

Merge branch 'devel' into CB-5197-create-connection-fields-dynamically

2ee88f7

CB-5197 switch to new model

616ff40

sergeyteleshev approved these changes Jun 18, 2024

View reviewed changes

sergeyteleshev requested a review from Wroud June 18, 2024 10:01

Wroud approved these changes Jun 18, 2024

View reviewed changes

yagudin10 and others added 7 commits June 25, 2024 16:16

Merge remote-tracking branch 'origin/devel' into CB-5197-create-conne…

44a8688

…ction-fields-dynamically

CB-5238 fixes after review

802c4e1

CB-5197 remove custom configuration type

5babb3c

CB-5238 remove custom config type from gql schema

d3afe0e

CB-5197 do not check configuration type for creds

31311f0

CB-5197 make argument optional

de1ad0e

CB-5238 fix creating connection with url

eee54dc

CB-5238 rename param

e7b0225

yagudin10 force-pushed the CB-5197-create-connection-fields-dynamically branch from b8a74ac to e7b0225 Compare June 27, 2024 15:39

yagudin10 and others added 2 commits June 27, 2024 17:52

CB-5238 rename param

3b80984

CB-5197 rename field

ef232de

Wroud approved these changes Jun 28, 2024

View reviewed changes

EvgeniaBzzz and others added 2 commits June 28, 2024 18:28

Merge branch 'devel' into CB-5197-create-connection-fields-dynamically

5822531

Merge branch 'devel' into CB-5197-create-connection-fields-dynamically

292eaa2

alexander-skoblikov merged commit 49875e4 into devel Jul 1, 2024
7 of 8 checks passed

devnaumov deleted the CB-5197-create-connection-fields-dynamically branch July 12, 2024 13:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CB-5197 create main connection fields dynamically #2693

CB-5197 create main connection fields dynamically #2693

yagudin10 commented Jun 7, 2024

DenisSinelnikov Jun 13, 2024

alexander-skoblikov Jun 14, 2024

alexander-skoblikov Jun 14, 2024

sergeyteleshev Jun 18, 2024

sergeyteleshev Jun 18, 2024

sergeyteleshev Jun 18, 2024

Wroud Jun 18, 2024 •

edited

Loading

CB-5197 create main connection fields dynamically #2693

CB-5197 create main connection fields dynamically #2693

Conversation

yagudin10 commented Jun 7, 2024

DenisSinelnikov Jun 13, 2024

Choose a reason for hiding this comment

alexander-skoblikov Jun 14, 2024

Choose a reason for hiding this comment

alexander-skoblikov Jun 14, 2024

Choose a reason for hiding this comment

sergeyteleshev Jun 18, 2024

Choose a reason for hiding this comment

sergeyteleshev Jun 18, 2024

Choose a reason for hiding this comment

sergeyteleshev Jun 18, 2024

Choose a reason for hiding this comment

Wroud Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

Wroud Jun 18, 2024 •

edited

Loading